Switch to using explicit WARN_CFLAGS

The rationale is documented well in the automake manual.

diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index 7f86e7480844a335549cfb2acaf812509e042d8d..84737a78d997a39ee3bade79126ae6bbbeb3ee0d 100644 (file)
--- a/Makefile-libostree.am
+++ b/Makefile-libostree.am
@@ -31,5 +31,5 @@ libostree_la_SOURCES = libostree/ostree.h \
        libostree/ostree-checkout.c \
        libostree/ostree-checkout.h \
        $(NULL)
-libostree_la_CFLAGS = -I$(srcdir)/libotutil -I$(srcdir)/libostree -DLOCALEDIR=\"$(datadir)/locale\" $(OT_COREBIN_DEP_CFLAGS)
+libostree_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/libotutil -I$(srcdir)/libostree -DLOCALEDIR=\"$(datadir)/locale\" $(OT_COREBIN_DEP_CFLAGS)
 libostree_la_LIBADD = libotutil.la $(OT_COREBIN_DEP_LIBS)

diff --git a/Makefile-ostree.am b/Makefile-ostree.am
index 714c4843af6c47c9ad0702bdc7eceefc15efe3ac..dfc09a052199d45f793ecde5e48a4c950cd4a5e1 100644 (file)
--- a/Makefile-ostree.am
+++ b/Makefile-ostree.am
@@ -34,5 +34,5 @@ ostree_SOURCES = ostree/main.c \
        ostree/ot-builtin-rev-parse.c \
        ostree/ot-builtin-show.c \
        $(NULL)
-ostree_CFLAGS = -I$(srcdir)/libotutil -I$(srcdir)/libostree -I$(srcdir)/ostree  -DLOCALEDIR=\"$(datadir)/locale\" $(OT_COREBIN_DEP_CFLAGS)
+ostree_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/libotutil -I$(srcdir)/libostree -I$(srcdir)/ostree  -DLOCALEDIR=\"$(datadir)/locale\" $(OT_COREBIN_DEP_CFLAGS)
 ostree_LDADD = libotutil.la libostree.la $(OT_COREBIN_DEP_LIBS)

diff --git a/Makefile-otutil.am b/Makefile-otutil.am
index 44eb65c8b510a277ae4f73730f35e2e0e70cb4cf..ff729bdc6d12a1b85a8d75c1d42ce773e1004ed3 100644 (file)
--- a/Makefile-otutil.am
+++ b/Makefile-otutil.am
@@ -32,5 +32,5 @@ libotutil_la_SOURCES = \
        libotutil/ot-glib-compat.h \
        libotutil/otutil.h \
        $(NULL)
-libotutil_la_CFLAGS = -I$(srcdir)/libotutil -DLOCALEDIR=\"$(datadir)/locale\" $(GIO_UNIX_CFLAGS)
+libotutil_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/libotutil -DLOCALEDIR=\"$(datadir)/locale\" $(GIO_UNIX_CFLAGS)
 libotutil_la_LIBADD = $(GIO_UNIX_LIBS)

diff --git a/Makefile.am b/Makefile.am
index fe3684c764195b7c68bb3a1c7c3dfd96da275174..917b29d2dce3404b655a666424db55b9dce5af2e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,7 @@
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 AM_CPPFLAGS = -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"'
+AM_CFLAGS = $(WARN_CFLAGS)
 
 NULL = 
 BUILT_SOURCES =

diff --git a/configure.ac b/configure.ac
index 92c06d5ee48bdd168680ede98607930ea46910f8..71a9e70e3bcf74ebc78aefa93d4df2460b3958cc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,16 +13,10 @@ AM_PROG_CC_C_O
 
 changequote(,)dnl
 if test "x$GCC" = "xyes"; then
-  case " $CFLAGS " in
-  *[\ \        ]-Wall[\ \      ]*) ;;
-  *) CFLAGS="$CFLAGS -Wall" ;;
-  esac
-  case " $CFLAGS " in
-  *[\ \        ]-Werror=missing-prototypes[\ \ ]*) ;;
-  *) CFLAGS="$CFLAGS -Werror=missing-prototypes" ;;
-  esac
+  WARN_CFLAGS="-Wall -Werror=missing-prototypes"
 fi
 changequote([,])dnl
+AC_SUBST(WARN_CFLAGS)
 
 # Initialize libtool
 AC_PROG_LIBTOOL